From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 16 Oct 2009 07:24:47 +0000 (+0100)
Subject: xend: add a description config item for each guest.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13220
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=242a16c3d17d81eb84fe3505417f22140b27af50;p=xen.git

xend: add a description config item for each guest.

Add a new option "description=" to each VM to increase the
manageability of VM, which could be accessed via "xm list -l
MACHINE".e.g add "description='(name, james),(priority 5), (owner
james.song@company.com)'" to configure file, User can get the VM's
attribute easily by "xm list -l Machine" or some tools.

Signed-off-by: James Song<jsong@novell.com>
---

diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py
index b94175cd47..8c70fab612 100644
--- a/tools/python/xen/xend/XendConfig.py
+++ b/tools/python/xen/xend/XendConfig.py
@@ -177,6 +177,7 @@ XENAPI_PLATFORM_CFG_TYPES = {
     'pci_power_mgmt': int,
     'xen_platform_pci': int,
     "gfx_passthru": int,
+    'description': str,
 }
 
 # Xen API console 'other_config' keys.
@@ -490,6 +491,8 @@ class XendConfig(dict):
                 self['platform']['xen_platform_pci'] = 1
             if 'vpt_align' not in self['platform']:
                 self['platform']['vpt_align'] = 1
+            if 'description' not in self['platform']:
+                self['platform']['description'] = ''
             if 'loader' not in self['platform']:
                 # Old configs may have hvmloader set as PV_kernel param
                 if self.has_key('PV_kernel') and self['PV_kernel'] != '':
diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index f929011bc7..e47db2f140 100644
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -507,6 +507,10 @@ gopts.var('usbdevice', val='NAME',
           fn=set_value, default='',
           use="Name of USB device to add?")
 
+gopts.var('description', val='NAME',
+          fn=set_value, default='',
+          use="Description of a domain")
+
 gopts.var('guest_os_type', val='NAME',
           fn=set_value, default='default',
           use="Guest OS type running in HVM")
@@ -989,7 +993,7 @@ def configure_hvm(config_image, vals):
              'guest_os_type', 'hap', 'opengl', 'cpuid', 'cpuid_check',
              'viridian', 'xen_extended_power_mgmt', 'pci_msitranslate',
              'vpt_align', 'pci_power_mgmt', 'xen_platform_pci',
-             'gfx_passthru' ]
+             'gfx_passthru', 'description' ]
 
     for a in args:
         if a in vals.__dict__ and vals.__dict__[a] is not None:
diff --git a/tools/python/xen/xm/xenapi_create.py b/tools/python/xen/xm/xenapi_create.py
index 6af21188a9..d8e9dc54c7 100644
--- a/tools/python/xen/xm/xenapi_create.py
+++ b/tools/python/xen/xm/xenapi_create.py
@@ -1077,6 +1077,7 @@ class sxp2xml:
             'pci_power_mgmt',
             'xen_platform_pci',
             'tsc_native'
+            'description',
         ]
 
         platform_configs = []